Auto merge of #2419 - dikaiosune:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 26 Feb 2016 22:33:44 +0000 (22:33 +0000)
committerbors <bors@rust-lang.org>
Fri, 26 Feb 2016 22:33:44 +0000 (22:33 +0000)
commit582dcb7eb2ad04c71e3d9b28dd84abf5c5779b22
tree5d29f5efce50ce6028009fd4da3735fea1217426
parent7a42f8049e9b9f813e458fb035f0cc6addbdba53
parent95193ca773a668b993891eefe08f3436752b7556
Auto merge of #2419 - dikaiosune:master, r=alexcrichton

Resolves #2417. I also reorganized the order of the items on the page and moved a little bit of text around. I think it's clearer, but critique is more than welcome.